issue150: comments added