Fix completion;
Merge branch 'master' of github.com:naspeh/tider