Fixed issue #58
Fixed issue #54
Fixed issue #50
Fixed issue #49
Fixed issue #56