Pull request for version 2.2.0

Hi Tiziano

This pull request fixes the following issues:
* #8
* #12
* #14

Cheers
Pat