Added version changes suggested by albinger