Fixes clang++ warnings - close #80