Fixes #43; update number of comments