Tidied up for V1.4 release