Merge pull request #144 from dmcdougall/ernesto-sep13-1

Comitting Ernesto CASL patch 1
Comitting Ernesto's CASL patch 2