Merge pull request #15 from maksimov/develop

Updated capabilities