Merge pull request #44 from gorbin/master

from master
Merge pull request #45 from gorbin/dev

Merge pull request #44 from gorbin/master