Merge pull request #147 from dmcdougall/ernesto-sep13-4

Comitting Ernesto CASL patch 4
Comitting Ernesto CASL patch 4
Comitting Ernesto CASL patch 5