merge code from host 25/12/2014