Merge pull request #146 from dmcdougall/ernesto-sep13-3

Comitting Ernesto CASL patch 3
Comitting Ernesto CASL patch 4