Prepare master

Works with g++ and clang