SAM #59, #41, #37. For more see MR
Merge pull request #67 from JanHorak/SAM_59_41_37

SAM #59, #41, #37. For more see MR
-- merged