Fixes #112. Verified all examples run.