closure
closure support
escape fix
Merge pull request #16 from Antek88/master

closure & escape fix