Adding comments for #138