changes related to #2 #112 #117 in english version #111