Fixed conflicts
Fixed conflicts
Fixed conflicts
Merge pull request #3 from Ashenmaster/merge-state

Merge state