Add context to status
Merge pull request #11 from danmcp/master

Add context to status