Added ability to add comments. Closes #18