Merge pull request #148 from dmcdougall/ernesto-sep13-5

Comitting Ernesto CASL patch 5
Committing Ernesto CASL patch 6