Merge pull request #1 from vhf/master

update with vhf:master