fixed #37
merged