Overlay work
Merge branch 'master' of https://github.com/og2t/patch