Moved to Guava collections. Closes #3