updated some stuff
Merge pull request #36 from JohnBDonner/john-edits

updated some stuff