Whitespace
Restore Java 6 compatibility.
Bump version in preparation for release