Merge pull request #336 from hhovsepy/master

refactoring content view definitions , some fixes
do not check package count
Merge remote-tracking branch 'upstream/master'