minor changes
Merge branch 'master' of github.com:bigomega/caas