Merge pull request #29 from zelzel2315/reviews

trying to pull changes from repo
pushing up last changes