Updated to latest gaffa
Updated to master