Sildeon #43

Open
Sildeon wants to merge 17 commits from Sildeon/Sildeon into master
ECAD Changes