Added calc and fixed makefile
Added travis