Fixed #2
Fixed issue #1.