Master branch update

implement error trace