Fixed, finally
Merge branch 'master' of github.com:elken/.emacs.d