merge update 28/20/2014