Merge pull request #1088 from Mauin/gon_nerd