changes for hw10
Merge pull request #10 from ettemaet/hw10

changes for hw10