Merge pull request #21 from olerem/buildfixes