PR #197 Improve '*'/'#' support to behave more like Vim