Fixes for citations
Merge pull request #148 from ayshih/cite

Fixes for citations