Simplify completer
Merge pull request #18 from adest/master

Simplify completer