SAM #96 and some other changes
Merge pull request #106 from JanHorak/SAM_96

SAM #96 and some other changes