Merge pull request #1 from hivefans/master

merge request