Merge pull request #3 from najoshi/master

pull to ucdbio