#21 a few more bugfixes
#21 Handle string breaks