Changes for 1.0

Added more test cases, lazy attribute handling, and contextual return.