Fixed syntax error. Hurr durr. Resolves #9.
Fixed regex and switched re.match to re.search
Merge branch 'upstream/master'
Updates