Packaging fixes
Merge pull request #11 from einhverfr/master

Packaging fixes