making changes
Merge pull request #4 from mattolde/master

making changes