Master 23/12/2014

Looking for contributors...