Merge branch 'master' into develop
fix error in search
Merge branch 'issue-33' into develop
update version
Merge branch 'release_0.1.13'