fixed #61
fixed #66
fixed #67
fixed #65