Version 1.0b - see readme for details