Merge pull request #40 from arturobernalg/feature/java8

Java 8 improvements: