Fixing clang compilation. closes #40