Marta branch

to include glpk wrapper + unit tests on master branch