Changes for 1.5

Contextual return handling added.  new test cases added.