Merge pull request #1 from CookieH/master

merge