Transitions added
Optimised build
Merge branch 'v2'