Merged pull request from jfdesjardins2000