made some changes
Merge pull request #1 from notandrewkaye/develop

this is my first pull request