Merge pull request #6 from awlayton/master

Beta 2.1

I'm satisfied, and so is @ssabpisa.