Removed -lz in Makefile
Merge branch 'master' into cleanup