fixed #11
Merge branch 'bugfix/#11' into auto-completion