Improve packaging
Merge pull request #2 from fungusakafungus/master

Improve packaging