Updated to commentsblock 2.2