Merging in the Comment Branch

This also addresses #1 and #2.