SAM #93 part I
Merge pull request #105 from JanHorak/SAM_93

SAM #93 part I