Updated review comments from Orene
Merge pull request #29 from Goginenni/calabash-query

Updated review comments from Orene