* apply review comments by SBoudrias, #542
* fix typo, #542