Merge pull request #11 from mruffalo/master

Minor tweaks/updates