Merge pull request #5 from alexander-myltsev/master

Another round of improvements