Added all the terms used in the paper. Closes #12.