First step towards dealing with comments as per issue #12