Merge pull request #182 from thefinestsieve/beta

2.1.5.6 assorted updates