:triumph: Now without compilation errors.
Merge pull request #190 from maksimov/develop

Now without compilation errors.