Merge pull request #1 from Danisan/master

Merge last changes
Merge pull request #1 from bmya/master

Merge pull request #1 from Danisan/master