Fixes #112. Verified all examples run.
Merge pull request #113 from kkasravi/master

Fixes #112