add $this go get_class
Merge branch 'master' into develop
upated utility class