Merge pull request #83 from LBliss/issue/66

Fix for issue #66
Fix issue #84

Use System.nanoTime instead of System.currentTimeMillis.