AESH Upgrade
Merge pull request #392 from Gonthim/master-AESH-upgrade

AESH Upgrade