Merge pull request #1 from freeminer/master

update