Added forced autocompletion
Merged master