Fixed Issue #9
Fixed Issue #21
Fixed Issue #29
Fixed Issue #30