Merge pull request #2 from disufi/master

Merge pull request #1 from AlexMihov/master