Re-added after/before functionality (support to strict mode) and major
refactoring. Version bump.