Fix #513, fix #510
v1.5.4
Merge pull request #520 from caseyjhol/master

v1.5.4 - fix #510, fix #513