Adding missing references + merging #315