issue #98 fixed
issue #113 fixed
issue #114 fixed
isssue #66 fixed