changes to package type
Merge branch 'develop'