Work with compiler 2.1.0
Release 2.2.1
Merge branch 'master' into develop