v2.1 changes
Merge pull request #2 from ddavison/fix-static-initializer

v2.1 changes