Updated FSM
Merge pull request #478 from GrygrFlzr/master

Updated FSM