Merge pull request #132 from bohmber/master

improved build