Forgot a file for #37 and added an option to speed up autocomplete