Merge pull request #3 from argeset/master

Update