public method return
Merge branch 'hotfix/public-method-return'