Topic/jnumber

It's certainly worth re-running on JDK8, it'll take a little bit for me to get that up and running on my machine as I'm on Ubuntu.