SAM #61, #38. For more Info see MR
Merge pull request #68 from JanHorak/SAM_61_38

SAM #61, #38. For more Info see MR