Zirkleac pull request

Finished with the homework