fixed issue #11 + matching test