Fixes for API
Merge pull request #15 from GeographicaGS/dev_raul_bugs

Fixes for API