Merge pull request #2 from hivefans/master

merge request