Merge pull request #29 from vitek/master

contextmanagers: Put state restore code into finally block
Fix NullCallableString() when called with no or multiple arguments