SAM #99
Merge pull request #102 from JanHorak/SAM_99

SAM #99