Merge pull request #1 from SimpleMachines/release-2.1

Update from main repo