Some reformat
Merge branch 'dev' into exp-async

Conflicts:
	jopa.c