Merge pull request #44 from gorbin/master

from master