Add modifications from 2.2.0
Merge pull request #3 from a5anka/dev

Add modifications from 2.2.0