Add missing changes from version 0.15