changes in core module Makefile
Merge branch 'master' of github.com:dfz-team/zapata