Merge pull request #8 from metanota/master

Merged our changes in one
Fixed ClassCast by adding absent empty interface implementation