Update to version 1.03, introduce updates from James Buster