Committing Ernesto CASL patch 10

Addresses part of #70.  #152 must be merged before this.