minior changes to backtrace feature #2
Merge branch 'dev'