Merge pull request #19 from colincoghill/3.9.2-bugfixes

Merge pull request #18 from colincoghill/master
Merge pull request #20 from colincoghill/master

testing