Merge pull request #123 from trevorbernard/master

Fix issue #122
Remove unused import
Revert back to use currentTimeMillis because it's less expensive than nanoTime