issue 85 + bibliography correction
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge remote-tracking branch 'refs/remotes/origin/master'
Issues 85, 99, 100, 123, 124, 126