Bug fix release for #27