Merge pull request #296 from jerv13/master

Fix exception issue
Merge remote-tracking branch 'upstream/master'