22/12/2014 working commit