Redid some regexps
Corrected some issues
Merge branch 'master' of github.com:Yomguithereal/colifrapy