Merge pull request #1219 from QuLogic/resolution

Use high-resolution timestamps