Adding ES
Merge branch 'feature/es' into release/0.0.7_es
Merge branch 'release/0.0.7_es' into develop