Additional 2.1.2 changes
Merge pull request #129 from thefinestsieve/beta

Additional 2.1.2 changes