Fixed issue with backtrace
Merge remote-tracking branch 'upstream/master'
Merge pull request #253 from jerv13/master

Fixed issue with backtrace