Fixed errors with packages, modifiers and imports
Merge branch 'develop' into 4.5.4
Merge pull request #80 from michogar/4.5.4

Fixed some minor errors