added a new feature.  still working.
Merge branch 'master' into newfeature1
added a new feature that works