Merge pull request #5 from andjo/master

A few more tests.
Some fixes to the string  escape and format stuff. Not 100% maybe but we're getting there