Merge pull request #10 from olerem/buildfixes