Merge develop (syntax fixes)