3 way merged develop and issue 55.