Merge pull request #1 from HappyRave/master

merge