fixed #110
merged