3.6
Merge pull request #20 from TopherJonesy/master

3.6