Merge pull request #17 from msassak/master

Triq commit clobbered the test action in the Makefile