Merge pull request #1 from magowiz/master

update