Updated to version 2.2.1