Merge pull request #4 from argeset/master

update