Merge pull request #244 from tobiasd/20150214stats