Merge pull request #1 from Crzyrndm/master

merge