removed ace and update description
Merge branch 'master' into dev