Java6 - closes #14.