Updated Makefile config. Version 0.0.22