Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix literal to char* conversion warnings
Merge pull request #282 from CodaFi/literal-const-char

Fixed some warnings.