[#69]Now works for me. Needs code review.

Can you take a look, @ichinaski ?