Added comparator
Corrected with last changes
A little bit of decoration
Traded places copyright/package info