Fixes for JDK8
Merge pull request #17 from caarlos0/fix/jdk8

Fixes for JDK8