Merge pull request #34 from Jordi-m/2.2.1_release to Master (moved file, so no history....)