updated to include recent changes to main calabash branch