Merge branch 'dev'
Merge pull request #1 from AlexaWebhead/master

Merge branch 'dev' from Adam