improve builtin get
Merge branch 'develop'