Update Makefile, cleanup code and increase version number.
Store caches variables in model module
Add profiling code