Updates for states
Merge remote-tracking branch 'origin/master'