Fixes issue #24.
Merge pull request #37 from mounirlamouri/should_would

Fixes issue #24.