Issue #162 - Bug Fix