Merge pull request #13 from olerem/buildfixes