Added in final changes for research paper
Merge pull request #36 from johns4ta/master

Added in final changes for research paper