Update the Makefile and the test program, so that this works under Intel Fortrantoo
Authored by: arjenmarkus 2014-05-25
Parent: [r355]
Child: [r357]