A few missing "SWMAX" ... (confer issue #334)
Merge pull request #336 from osae/fix_smax

A few missing "SWMAX" ... (confer issue #334)