Duplicate the PR #1

This is a duplicate of the pull request that @Altai-man has closed and realized he hadn't actually merged it.