Integrated repo #1. Added some features to Ace #2.