language changes issue #18