Merge branch 'master' into old-state
Merged
Fixed minor bugs
Merge remote-tracking branch 'origin/old-state'