Merge pull request #17 from scorphus/es0_90

Bring improvements made into master branch