correct notification messages ( close #58)