Fix packaging and some code.
Merge pull request #8 from pwnall/package

Fix packaging and some code.