Some fixes
Merge pull request #8 from GeographicaGS/dev_raul

Some fixes