fixed #116
merged