better regexp and mapping
removing log and better undefined check
Merge pull request #1165 from waglik/master

better regexp and preparing for rebranding