SAM roll.
Merge pull request #168 from BJLTomr/master

Sam roll fix.