Merge branch 'master' into development
Merge pull request #9 from jeremykendall/develop

Merge branch 'master' into development