added first autocomplete implementation
merge with master