fixed #54
merged