Bug fix release for #14