master merged to cast5

master merged to cast5