add search / register function
Merge branch 'develop/0.7.0'