Merge pull request #705 from nla/bug/acm-dsc-740

Bug/acm dsc 740
Merge branch 'master' into bug/acm-dsc-740