addressing some feedback
Merge pull request #9 from jeffwilcoxmsft/master

Updating 'dev' branch