Transitions
Merge branch 'master' of github.com:marvinsiq/xmimodel