Updates for 2.2.1 patch
Merge pull request #64 from khawkins/221_update

Updates for 2.2.1 patch