SAM #100
Merge pull request #103 from JanHorak/SAM_100

SAM #101