C++11

Testing in travis (do not merge)