2.2 version
Merge pull request #1 from PiniR/master

2.2 version