fixed #23
fixed #33
test confilict #36
fixed #33
merged #36