Fixed some package issues
Merge branch 'master' into more_poem_types