Incorporated diff between current Google Code master of gismotools, and modifications I made this summer