Fixed Issue #2
Fixed Issue #4