added some edits
Merge pull request #2 from vicapow/master

some edits