Merge pull request #505 from Nate-Devv/master

Fix #504.