status refactoring
Merge pull request #38 from SuperTux88/status-refactoring

status refactoring