some fixes
for gathering ans parsing
Merge branch 'master' of git://github.com/geospot-team/geospot