merge of original repo

...