Update to be c++11 compatible