Merge pull request #330 from ovatsus/master

Merge #326