minor fixed + syntax enhancements
bump up plugin version [2.1]