Merge pull request #1 from Azdie/master

This pull