Merge pull request #7 from karianna/master

Java 7 idioms + some minor tidying
Get this back working ;)