Merge pull request #1 from Zarel/master

Merge