Optimise escape function
Use guards instead of conditional expression
Add TODO
Merge branch 'master' of https://github.com/fhartwig/cassava