Changed version to 2.2.0 and fixes #19