Merge pull request #1 from Whitebeard86/master