fixed issue #22
changes