Merge pull request #115 from Shuffle/0x0elliot/stats-issue

Statistics counting issue with a time based solution

Author: frikky