More data to play with!
More stats for all! But the try/exception doesn't work now
Merge remote-tracking branch 'origin/master'