Merge pull request #145 from dmcdougall/ernesto-sep13-2

Comitting Ernesto's CASL patch 2
Comitting Ernesto CASL patch 3