Issue #40 Fixed