Merge pull request #18 from WindowsAzure/master

Merging dev branch with master