Added Finite State Machine
Merge branch 'origin/master'