Added changes from https://github.com/bawbgale/dotfiles