Simon - 2012-09-24

Moving this to feature requests