Kotlin compatibility fix
Merge pull request #513 from fogone/master

Kotlin compatibility fix