Simplified timing code, to remove unnecessary "adjustment" based on System.currentTimeMillis()
Merge pull request #270 from fragmer/master

Simplified timing code (remove adjustment based on currentTimeMillis)