Fixed C++11 compliancy and string handling