Merge branch 'fix/#10' into v0.1 (close #10)
(cherry picked from commit b92e6ce9e2b7454e32fa0025de578279478ef5f5)