Fixed Issue #170
Fixed Issue #175
Fixed Issue #171
Fixed Issue #169
Fixed Issue #164