update
merging in Dans change

Merge branch 'master' of https://github.com/scollier/summitcontainers2014