Fixed issue #49.
Fixed issue #50.