Issue #17 implemented