More state indicators
Merge pull request #24 from mihawk90/patch-3

More state indicators