Merge pull request #3 from najoshi/master

pull to ucdbio
Merge pull request #26 from ucdavis-bioinformatics/master

Merge pull request