minor fix

fixes #66
Merge remote-tracking branch 'upstream/master' into exception