fixed the path to the snap directory in Makefile
Merge remote branch 'upstream/master'