do merge
Merge branch 'master' of https://github.com/Hazematman/gijam
Merge branch 'master' of https://github.com/Hazematman/gijam
fix compiling