Finished going over the functions, still need to do one more proofreading
Merge remote branch 'upstream/master'