Following begining according to issue #21
Following ready fixed issue #21