Merge pull request #257 from olegabr/feature-apidoc

merge apidoc changes into master