Bug fixes
Merge pull request #4 from GeographicaGS/dev_raul

Bug fixes