Merge pull request #2 from a5anka/master

Git migration changes
Add modifications from 2.2.0
Merge branch 'dev'