Merge pull request #5 from olerem/buildfixes