Packaging
Merge pull request #1 from fuzzgun/master

Packaging