WIP
Merge branch 'master' into development
FIX path issue closes #2
Clean repository, remove unnecessary files
Merge remote-tracking branch 'origin/master'