Update for version 0.18