Merge pull request #5 from Wackerbarth/Transition

Transition