fixed ace version
Merge branch 'ray'