Worked on trait
Merge branch 'master' of https://github.com/admiller/generations