Closes #10
With the help of Java 8 it was really easy to do.