Merge branch 'dev1'
mistake checker was added