Merge of fork development

Merge of development done on fork