update
Merge pull request #23 from JohnBDonner/john-edits

update