merge
fixed issue #12