Fix failing tests
Update Makefile
Release 1.13