Bug fixes. Release 1.1.1