Language update
Minor update
Fix for an Issue #818