changes on Makefile
Merge branch 'master' of github.com:AGILESCIENCE/agilesci1