Fix #10: Add strings where needed

@HugoGiraudel thought I would PR so you could check it over if you don't mind?

Let me know what you think.