Update

adds support for 1.2