Merge pull request #1 from fmw-sb-test/master

Can one of the admins verify this patch?