Run on 4.3
Merge pull request #1 from kuppe/master

Compatibility with 4.3