Merge pull request #149 from dmcdougall/ernesto-sep13-6

Committing Ernesto CASL patch 6
Comitting Ernesto CASL patch 4
Committing Ernesto CASL patch 7