Merge pull request #1 from Danisan/master

Merge last changes