Fixes import and packaging issues
Merge pull request #61 from abstractj/compilation

Fixes import and packaging issues