Fix types
Merge pull request #6 from marcingy/8.x-1.x

Fix types