Cleaned packaging
Merge pull request #1 from pbparadox/master

Cleaned packaging