Merge pull request #3 from jahewson/master

Linux Build