Fixed issue #64 #65 #66