FSM updates
Merge branch 'master' of github.com:kelnishi/Jamjet339