Merge pull request #5 from Senorihl/master

Update
Merge pull request #8 from Azzur/master

Merge pull request #5 from Senorihl/master