Some tidying
Merged from master
Merge branch 'master' of github.com:cage433/maker
Can compile with zinc
Merge remote-tracking branch 'origin/master'