added brian's changes
Merge pull request #15 from JohnBDonner/john-edits

added brian's changes