not the commit -- no funny
Merge pull request #579 from hizel/nohizel

not the commit -- no funny