changes to review
Merge pull request #22 from rozzzcarrier/master

changes to review