Merge of branch devel_d #23