pushing up last changes
Merge pull request #30 from zelzel2315/reviews

pushing up last changes