Changes proposed in this PR: Please explain your changes in addition to your commit messages. Fixes #