hack a better service part
Merge branch 'hotfix/0.2.0'