Remove unused import
Revert back to use currentTimeMillis because it's less expensive than nanoTime
Merge pull request #124 from trevorbernard/master

Minor improvements