Merge pull request #6 from punker76/2c730fb8c69bcbf508e348ea1cab3789c164065a

fix for shortcut statistic calculation
Merge remote-tracking branch 'upstream/master'