2.2.0.2 compatching
Merge pull request #40 from Meneth/master

2.2.0.2 compatching