Merge pull request #1791 from Oddj0b/Calabash

Based on a template from jmoody