Re-enable cleanup; bug fixes
Merge branch 'master' of https://github.com/wolfgangmm/AtomicWiki