Merge pull request #88 from ehsteve/master

My pass
update for jack