Rework code, README and sample output to v1.1.0