drewnoakes Merge pull request #1074 from rickshaw5724/avoidReadingTimeStampCounter