Changes to compile with clang++ -o3 and C++11 flags