Issue #11 implemented