Code

Merge branch 'es/close'