Merge pull request #5 from argeset/master

Update