Issue #170 Bug Fix