Advances of HW 2
Merge pull request #73 from pilukno/master

Advances of HW 2