Partly cleaned up for sharing with GitHub
Fixing a merge mistake