update to ES 1.2.1, reformatting source
merged