Files from SPAA14 added
Makefile added