Support for 4.2
Merge pull request #236 from Jaspur/master

Support for 4.2