New version
Improved adaption