Fixed compile errors
Merge pull request #82 from maksimov/develop

Fixed compile errors