beginnings of bug 6195
Merge pull request #167 from apatel/master

beginnings of bug 6195