merging pr: #431 - in progress still
manual merge of: #452 and more