Update to version 2.2

Merge from Templaza