Merge pull request #509 from caseyjhol/master

v1.5.3
Fix #513, fix #510
v1.5.4