refactored wrapper function
Merge branch 'hotfix/0.6.2'
changed version