Preparing for 2.2 samples
Merge pull request #1 from mnriem/master

Preparing for 2.2 samples