Merge branch 'develop'
Merge pull request #2 from cbleslie/master

Merge branch 'develop'