Merge pull request #5 from etothepii/master

Merging in master
Merge branch 'master' into develop
Merge pull request #6 from etothepii/develop

Develop