cherry-pick status updates from master
Merge pull request #123 from mikemccracken/ex-add-status

cherry-pick status updates from master