Merge pull request #16 from smarinov/master

Merge #16