Ade branch

Merging Ade branch with master.