Updates for Ubuntu PPA
Improve the Makefile