Sync with LANL-Bioinformatics fork