Much faster version - remove the treeset and add array bucket mappings,
Merge branch 'master' of https://github.com/kevhussey/java.git