addresses clang++ warnings
Merge branch 'newbranch'