Add makefile
Better error handling
Merge branch 'master' of github.com:marcomorain/tcat