preparing to merge
Merge pull request #23 from blind-squirrel/Sharon

preparing to merge