SAM #73, #74 and #75
Merge pull request #79 from JanHorak/SAM_73_74_75

SAM #73, #74 and #75