Merge fix to issue #7 into master branch (fragment overlay)