Fixes #473
Fixes #473
Fixes #473
Fixes #473
Merge pull request #564 from RyanPepley/issue473

Fixes #473