Added locus_table to table of functions
Merge branch 'master' into gh-pages