Autocomplete plus fix for issue #36
Merge pull request #37 from jonnyhaynes/master

Autocomplete plus fix for issue #36