Create state manager
Merge branch 'origin/master'