Merge pull request #87 from nolanfilter/JimmyJam

Jimmy jam