Fixed bugs
Merge pull request #63 from JoshFB/statusBugs

Fixed bugs