Merging https://github.com/scrooloose/nerdcommenter/pull/24