nil citation field bug
Merge branch 'hotfix-0.2.1' into staging