improve
Merge branch 'devel' of github.com:justmao945/StackTrace into devel