Merge branch 'dev' of github.com:Ezphares/giraf_database into dev
Merge branch 'iss_233' into dev
Merge branch 'iss_233' into dev
Merge branch 'iss_233' into dev
Fixed memory allocation
Fixed port