many improvements regarding to issue #84