End Transition Update
Merge pull request #213 from Kiroshima/master

End Transition Update