Fix bugs and cosmetic change
Merge branch 'master' of github.com:masatana/dotfiles