Some Edits
Merge pull request #67 from kguischard13/master

Some Edits