Modified the fix for #19, fixed language a bit.