Integrating bug fixes from Kees.
v0.9.39
Fixed file extension in Makefile