Add a 'clean' rule to the Makefile
Merge from master