code cleanup : consistent use of string quotes...
Merge pull request #121 from Kunstmaan/feature/code-cleanup

code cleanup : consistent use of string quotes...
solved merge conflict