Merge pull request #5 from juharris/handle-colon-in-feat

Handling ":" better in feature parsing