Ace compatibility fix
Merge branch 'develop'
Merge pull request #2 from proxyfabio/master

Ace compatibility fix