State Machine Fix
Merge branch 'master' of github.com:filiperp/filiperp_project_skeleton