Update code with latest from MSDN 7/15/2014
Merge pull request #8 from CPCStrategy/develop

Update code with latest from MSDN 7/15/2014