linking done, no test
Merge branch 'iss_233' of github.com:Ezphares/giraf_database into iss_233