fixed issue #21 added