Fixed issue #24
Fixed issue #2
Fixed issue #24