Pull request from my master to AAROC