The three points below are part of Mohammad's response.  Would you mind rebasing, and putting yours just before  Joseph Werle's, since you got in your PR before him?