rolandtr-808
Merge pull request #816 from YaleSTC/808_for_master

rolandtr-808