"Adding E"

Merging from Alpha_release_01 to Master