Changing affiliations and bibliography
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from olest/master

Adding changes requested by Tony