This commit close issue #97 and #98