Comitting Ernesto CASL patch 1

Addresses part of #70.