closes #159. fixed citations
Merge branch 'formatting'