Merge pull request #206 from shabanovd/develop

API change