Merge pull request #41 from utzig/update-status-mgmt

Update to status management