changes made
Merge pull request #7 from dejackson/master

changes made