Merge remote-tracking branch 'origin/nrrv'
Merge branch 'master' of https://github.com/Pastulio/crunch