End Round improved
pull from upstream
Merge branch 'master' of https://github.com/adrianwenger/SE