Merge pull request #95 from townxelliot/master

Minor edits