re commit of my last commit
Merge branch 'working' of https://github.com/CrossIan/GeoBook into working