Update to version 0.21