201305_May18 update from last version of 201305_May17