2nd commit
Merge https://github.com/saforem2/RESEARCH_FA13