Added autocomplete closes #1