Fix some bugs
Merge branch 'master' of github.com:shymonk/.emacs.d