Improve packaging
Merge pull request #187 from asergi/master

Improve packaging