David's change to fix error
Merge branch 'master' of https://github.com/FranklinCoop/IS4C