From ss to normal function
Score parser
Merge branch 'master' into vador