Closes #172
Merge pull request #173 from TrevorPilley/3.0.2

3.0.2