Fixed issue #55
Fixed issue #53.