Merge pull request #38 from skyyuan/deve

update
update