Merge pull request #151 from dmcdougall/ernesto-sep13-8

Committing Ernesto CASL patch 8
Committing Ernesto CASL patch 9