use const char ptr instead of non-const in string literal parameters
Fix merge conflict with #18
Merge branch 'MrMoose-master'