bump version
merge from develop
Merge branch 'develop'
fix bugs with autocomplete