Merge branch 'hotfix/0.1.1'
fix setup.py entry_points
Merge branch 'hotfix/0.1.2' into develop