Extra stuff for Friday
Merge branch 'master' of https://github.com/Binney/sweaton2