Fix #507
Merge pull request #508 from caseyjhol/master

Fix #507