Fixes.
Merge branch 'master' of github.com:bereacs/eocs-tools