Part of SAM #72
SAM #72 | Fix
Merge pull request #83 from JanHorak/SAM_72

Sam 72