Copyright, fix bib
Merge
Merge pull request #7 from zanderso/master

Copyright, fix bib