Merge pull request #893 from rustyswayne/1.5.0

Merge 1.4.1
Merge pull request #903 from rustyswayne/1.5.0

Merge 1.4.1