Issue 22

fixed issue #22