properly merged #20
pulled in new comment remover