Work In Progress
Merge branch 'master' of https://github.com/dizitart/trace
Update Flags