bug fixes
Merge branch 'master' of git@github.com:mukerjee/cdn