--> develop-SNAPSHOT
Merge pull request #58 from alxdarksage/package-fixes

 --> develop-SNAPSHOT