Fixed stat controller bugs
Merge pull request #128 from stefk/stat-bugs

Fixed stat controller bugs