Issue #22: proposed fix
small style changes to the transition builder
Merge branch 'transition-builder' into dev