V3.1

Recommitting all changes