Fixed issue #61
Fixed issue #61