Fix transitions
Merge pull request #3 from silvenon/master

Fix transitions