merge develop
fixed #20