Merge pull request #575 from adminempire/master

Cleaning up broken and some other packages