2.1.2
Merge pull request #8 from TopherJonesy/master

2.1.2