update makefile
Merge pull request #14 from qbuat/master

Implementation of the hybrid data