I think I finally got it right.
Merge branch 'master' of github.com:zardoru/dotcur