Patrick

Merged to master