Merge pull request #1 from GeographicaGS/dev

Dev
bugs
Merge branch 'master' into dev_javier
bugs