Merge pull request #97 from dirkrombauts/master

More finetunings to build script