todo
fix StateMachine
Merge branch 'feature/all_swift'