Merge pull request #1 from janm399/master

Better build file