Merge PR 39 from xetorthio/johm

https://github.com/xetorthio/johm/pull/39 from @gersh