v1.5.1 (fix #495)
Merge pull request #497 from caseyjhol/master

v1.5.1 (fix #495)