issue #11 implemented