[in progress! use master branch instead] fixed issue #217