Finished and compiled
Merge branch 'master' into dev