Added bugfix section and discussion of #14