WIP
Fix string formats
Merge pull request #2 from robinwit/master

Fix string formats