Synch latest code 

pull request for latest code.  see if it automatically merges