Merging pull-request from @lucasmerencia/dotfiles-linux