Added first exercice and extended version