Improved overlay handling
Merge pull request #2 from tudo/master

Improved overlay handling