Fix #13 (Also solves an issue where one couldn't compare std::string to const char*)