repaired Package
merged conflits
Merge pull request #2 from JellyBellyDev/master

repaired Package