Version 2.31

Massive changes in structure and funcionality.