Issue #40 fixed