fixed startwith bug & added more rules
Merge branch 'branch1'