Finished C++11 implementation