use std::stoi() instead of atoi()
compile with c++11 features to use stoi()
Merged stuff
Merge branch 'jan-schreib-use-exception-safe-function'