Merge pull request #15 from delcypher/compile_fixes

Compilation fixes from Dan Liew