fixing some bugs
Merge branch 'dev' of https://github.com/GeographicaGS/Alboran into dev