Merge pull request #13 from dscho/buildhive-fix