fixed #7
merge