Merge pull request #231 from TrevorPilley/develop

4.0.1
Merge pull request #232 from TrevorPilley/master

Merge pull request #231 from TrevorPilley/develop