removed some stuff...
Merge branch 'master' of github.com:gretac/trace-generator