Merge pull request #3 from MalcolmD/master

Updated paper
Merge pull request #5 from lcdavis13/master

merge