this commit fixes and closes issue #29