Merge pull request #996 from rustyswayne/master

Merge 1.5.1 to master