Merge pull request #6 from wrathematics/master

get updates
bib updates
Merge pull request #25 from snoweye/master

bib updates