implement interface
Merge branch 'hotfix/1.0.6'