Fixes for Clang building
Merge pull request #42 from dschatzberg/forSESA

Fixes for Clang building