fixed #13
merged