ensuring strings to prevent NoneType concatenation errors
merge
Merge branch 'momokatte-master'