Merge pull request #506 from caseyjhol/master

v1.5.2
Fix #499
Fix #499
Fix #507