Merge pull request #150 from dmcdougall/ernesto-sep13-7

Committing Ernesto CASL patch 7
Comitting Ernesto CASL patch 4