Merge pull request #2 from crumblingstatue/master

Fix linux (gcc, clang) build errors
format