Merge pull request #1 from shareyan/master

update