Merge pull request #158 from claudius108/master

Improvments for the general test build