Merge pull request #1 from shinigamiryuk/master

pulling new changes