Merge pull request #25 from snoweye/master

bib updates
Merge pull request #7 from wrathematics/master

Merge pull request #25 from snoweye/master