Enable loading of comments

Resolves #2