better package management
Merge branch 'hotfix/0.1.2.c'