Made C++11 compatible