ASE improvements
Merge pull request #293 from PatrickDeelen/master

ASE improvements