Merge pull request #15 from dkorolev/master

Bringing master up to date.