Merge pull request #77 from jurvis/main