Committing Ernesto CASL patch 6

Address part of #70.  #148 must be merged before this.