Fix compilations issues in master
Merge pull request #28 from openwide-java/fix-compilation-errors-in-master

Fix compilations issues in master