Made changes so that C++11 is not required anymore for compilation