Updated this forked version to match the develop/feature/c++11 branch