Merge pull request #1 from wylie/develop

adding jelly
committing changes