merge and commit for contribute

Fixed #16