Merge pull request #96 from chepazzo/develop

Merged DSCP edits into trigger version of acl.parser.