Merge divisions-38, close #38

Need to merge divisions-38 as it closes issue #38.