Applies fixes lost in a merge action
Merge pull request #12 from stenbacka/fixes-for-ess

Applies fixes lost in a merge action