Moar fixes
Moar fixes
Merge pull request #10 from GeographicaGS/dev_raul

Dev raul