Merge pull request #1 from AlexMihov/master

ba
Merge pull request #4 from disufi/master

Merge pull request #1 from AlexMihov/master