Separate auto-completion from answer type
Merge pull request #66 from davispuh/master

Separate auto-completion from answer type