Merge pull request #488 from rocky/with-as-with-pass

Merge pull request #488 from rocky/with-as-with-pass #539