Master copy from 23/12/2014

looking for contributors...