Fixed #1. Added regex support