Merge pull request #118 from 2001db8/ESA_update_201601