Merge @btalbott's edits. Thanks Bev! (fixes #7)