commit from jeremy
Merge pull request #17 from jeremytowne/master

Change from Jeremy