Merge pull request #247 from ivanlanin/master

PR 0.10.1
Merge remote-tracking branch 'upstream/master' into develop
QA: Misc. bugfixes and docblock improvements