Version 0.9b - see readme for details