Merge pull request #120 from thefinestsieve/beta

Two minor fixes
2.1.2.1 updates