xdorxd's homework
Merge pull request #21 from xdorxd/master

xdorxd's homework