adding modification flag to the status line
merging master to the working branch