fixed #17
merge