Added agreed text from issue #37