EWF update
Subhero link tweak.
Fixed conflict.
Merge pull request #8 from adobe/larz/clean-up

Larz/clean up