Removed regex for more pythonic solution
Added version; v1.1