merge back to master repo. See my email for information

merge back to master repo. See my email for information