fixed #110
merged #167