Task done and commented directly on github #27