Merge pull request #215 from olegabr/feature-apidoc

Merge with master branch