Merge pull request #36 from fingon/compile-fix