Added references. Also closes #608.