merge develop to fix merging

i've merged latest develop into your branch. if you can merge this i'll merge it into develop later