Merge pull request #1 from x42/master

build system cleanup