Issue #17 added