Fixed Issue #59
Fixed Issue #95