EE commit
Merge pull request #14 from wtnbjn/EE_branch

EE commit