Improved completion. (Now case insensitive).
Merge branch 'develop'