Merge Annotations-Methods-Citations branch into Master

Created to resolve issue #45.