small changes to make it compilable again
Merge branch 'master' of github.com:fpsal/esylab_project