2.1.18

Some improvements.
Can be used as beta.