Merge branch 'hotfix/0.0.2a'

Fixed package distribution bugs
Merge branch 'develop'
Undo some bad changes