Fix string formats
Merge PR#2 from @robinwit