FIX #35 and #36 #40

Merged
heinzel merged 3 commits from heinzel_canceld into master 2021-01-07 13:06:54 +01:00