Simon - 2012-09-24

moving this to feature requests, thanks