updating from the beginning
Merge branch 'Refactoring_SDMLib' of https://github.com/azuendorf/SDMLib into Refactoring_SDMLib