fixed merge
improved regexes
improved atlas