Fix -install_name for dynamic library under OSX
Merge branch 'tmp'

Conflicts:
	src/makefile