Update library to 2.1.6. Minor bug fixes.