Fix arecarn/crunch#12
Merge pull request #31 from mMontu/Dev

Fix arecarn/crunch#12