Allow terminating contexts
Merge pull request #1 from tuxychandru/master

Allow terminating contexts