Fixed issue #72
Fixed issue #73
Fixed issue #77