Merge pull request #8 from MobliMic/develop

Develop
Merge pull request #7 from TheRyanHowell/master

pull ryans code
Merge branch 'master' into develop