Added tag 0.3.18 for changeset fe6872e2f86b