Merge pull request #1 from eMusik/develop

Develop
Merge remote-tracking branch 'origin/develop'
Release: v1.0
Removed make file.
Merge branch 'master' into develop