fix code escaping
fix tests
Merge branch 'master' of https://github.com/shuttlelang/shuttle4j