Merge pull request #473 from godarklight/issue-460