Initial version
Fixing regex and output