Jam coding
Merge pull request #3 from jonschoning/master

Jam coding