Merge pull request #259 from eile/master

Integrate CommonCTest, Fix #258, cleanups
Fix build