Merge pull request #3 from Azdie/master

Here is another one