Abes

Merging abe's changes with master