Updated parsing.
Merge branch 'master' of github.com:LeonLeibbrandt/telco