fix make issues
Merge branch 'master' of https://github.com/mwpher/MattLib into HEAD

Conflicts:
	Makefile