Some fixes
Merge pull request #9 from GeographicaGS/dev_raul

Some fixes