Some changes based on mmresende pull request