Added c++11 and lambdas