License header updates
Merge pull request #60 from abstractj/license

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

Fixes import and packaging issues
format tabs into space