Merge pull request #18 from WindowsAzure/master

Merging dev branch with master
Merge pull request #20 from WindowsAzure/dev

Merge pull request #18 from WindowsAzure/master