Homework3 rework
Merge pull request #133 from ilianzero/master

Homework3 rework