Merge pull request #114 from winjs/development Development
Merge pull request #112 from winjs/development Development