Update to version 0.18