Merge pull request #777 from Arantor/release-2.1

Some more goodies for SMF