fixed #78
merged