Fixed issue #68
Fixed issue #66